From 4470e5bc93b56701842786931aca418b3e966eba Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 12 Dec 2019 18:46:53 -0500
Subject: [PATCH] gtk-demo: Some touchups

Make the theming style classes demo look a bit less odd.
---
 demos/gtk-demo/fontrendering.ui        |   7 +-
 demos/gtk-demo/iconscroll.ui           |   9 +-
 demos/gtk-demo/scale.ui                |  20 +-
 demos/gtk-demo/themes.ui               | 395 ++++++++++++-------------
 demos/gtk-demo/theming.ui              |   2 +
 demos/widget-factory/widget-factory.ui |  88 +++---
 6 files changed, 263 insertions(+), 258 deletions(-)

diff --git a/demos/gtk-demo/fontrendering.ui b/demos/gtk-demo/fontrendering.ui
index 59e24ff825..8803dbd7dc 100644
--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -165,10 +165,11 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="orientation">horizontal</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <style><class name="linked"/></style>
+            <style>
+              <class name="linked"/>
+            </style>
             <child>
               <object class="GtkRadioButton" id="text_radio">
                 <property name="draw-indicator">0</property>
@@ -183,7 +184,7 @@
               </object>
             </child>
             <layout>
-             <property name="left-attach">0</property>
+              <property name="left-attach">0</property>
               <property name="top-attach">3</property>
               <property name="column-span">7</property>
             </layout>
diff --git a/demos/gtk-demo/iconscroll.ui b/demos/gtk-demo/iconscroll.ui
index e9bf7d8a95..f1ae6415b2 100644
--- a/demos/gtk-demo/iconscroll.ui
+++ b/demos/gtk-demo/iconscroll.ui
@@ -31,9 +31,12 @@
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow">
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
-        <property name="hadjustment"><object class="GtkAdjustment" id="hadjustment"/></property> 
-        <property name="vadjustment"><object class="GtkAdjustment" id="vadjustment"/></property> 
+        <property name="hadjustment">
+          <object class="GtkAdjustment" id="hadjustment"/>
+        </property>
+        <property name="vadjustment">
+          <object class="GtkAdjustment" id="vadjustment"/>
+        </property>
       </object>
     </child>
   </object>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index b9c12059b9..ff0119a623 100644
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -75,11 +75,11 @@
             <property name="adjustment">adjustment2</property>
             <property name="hexpand">1</property>
             <marks>
-              <mark value="0" position="bottom"/>
-              <mark value="1" position="bottom"/>
-              <mark value="2" position="bottom"/>
-              <mark value="3" position="bottom"/>
-              <mark value="4" position="bottom"/>
+              <mark value="0" position="bottom"></mark>
+              <mark value="1" position="bottom"></mark>
+              <mark value="2" position="bottom"></mark>
+              <mark value="3" position="bottom"></mark>
+              <mark value="4" position="bottom"></mark>
             </marks>
             <accessibility>
               <relation type="labelled-by" target="label_marks"/>
@@ -115,11 +115,11 @@
               <relation type="labelled-by" target="label_discrete"/>
             </accessibility>
             <marks>
-              <mark value="0" position="bottom"/>
-              <mark value="1" position="bottom"/>
-              <mark value="2" position="bottom"/>
-              <mark value="3" position="bottom"/>
-              <mark value="4" position="bottom"/>
+              <mark value="0" position="bottom"></mark>
+              <mark value="1" position="bottom"></mark>
+              <mark value="2" position="bottom"></mark>
+              <mark value="3" position="bottom"></mark>
+              <mark value="4" position="bottom"></mark>
             </marks>
             <layout>
               <property name="left-attach">1</property>
diff --git a/demos/gtk-demo/themes.ui b/demos/gtk-demo/themes.ui
index db6f1ebf98..97de0278ba 100644
--- a/demos/gtk-demo/themes.ui
+++ b/demos/gtk-demo/themes.ui
@@ -6,236 +6,235 @@
       <object class="GtkHeaderBar" id="header">
         <property name="show-title-buttons">1</property>
         <child type="end">
-          <object class="GtkLabel" id="fps">
-          </object>
+          <object class="GtkLabel" id="fps"/>
         </child>
       </object>
     </child>
     <child>
-  <object class="GtkGrid" id="grid">
-    <property name="margin">10</property>
-    <property name="row-spacing">10</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkToolbar">
-        <property name="hexpand">1</property>
-        <property name="show-arrow">0</property>
-        <style>
-          <class name="primary-toolbar"/>
-        </style>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
-            <property name="active">1</property>
-          </object>
-        </child>
+      <object class="GtkGrid" id="grid">
+        <property name="margin">10</property>
+        <property name="row-spacing">10</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="sensitive">0</property>
-            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Raised</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
+          <object class="GtkToolbar">
+            <property name="hexpand">1</property>
+            <property name="show-arrow">0</property>
             <style>
-              <class name="raised"/>
+              <class name="primary-toolbar"/>
             </style>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Normal</property>
+                <property name="use-underline">1</property>
+                <property name="is-important">1</property>
+                <property name="icon-name">edit-find</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Active</property>
+                <property name="use-underline">1</property>
+                <property name="is-important">1</property>
+                <property name="icon-name">edit-find</property>
+                <property name="active">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="sensitive">0</property>
+                <property name="label" translatable="yes">Insensitive</property>
+                <property name="use-underline">1</property>
+                <property name="is-important">1</property>
+                <property name="icon-name">edit-find</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Raised</property>
+                <property name="use-underline">1</property>
+                <property name="is-important">1</property>
+                <property name="icon-name">edit-find</property>
+                <style>
+                  <class name="raised"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Raised Active</property>
+                <property name="use-underline">1</property>
+                <property name="is-important">1</property>
+                <property name="icon-name">edit-find</property>
+                <property name="active">1</property>
+                <style>
+                  <class name="raised"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="sensitive">0</property>
+                <property name="label" translatable="yes">Insensitive Active</property>
+                <property name="use-underline">1</property>
+                <property name="icon-name">edit-find</property>
+                <property name="is-important">1</property>
+                <property name="active">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolItem">
+                <child>
+                  <object class="GtkEntry" id="entry1">
+                    <property name="can-focus">1</property>
+                    <property name="width-chars">10</property>
+                    <property name="invisible-char">•</property>
+                    <property name="placeholder-text" translatable="yes">Search...</property>
+                    <property name="secondary-icon-name">edit-find-symbolic</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolItem">
+                <child>
+                  <object class="GtkSwitch" id="switch1">
+                    <property name="can-focus">1</property>
+                    <property name="valign">center</property>
+                    <property name="tooltip_text">Switch it</property>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Raised Active</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
-            <property name="active">1</property>
+          <object class="GtkBox">
+            <property name="valign">center</property>
+            <property name="halign">center</property>
             <style>
-              <class name="raised"/>
+              <class name="linked"/>
             </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="sensitive">0</property>
-            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">edit-find</property>
-            <property name="is-important">1</property>
-            <property name="active">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToolItem">
             <child>
-              <object class="GtkEntry" id="entry1">
+              <object class="GtkButton">
+                <property name="label" translatable="yes">Hi, I am a button</property>
                 <property name="can-focus">1</property>
-                <property name="width-chars">10</property>
-                <property name="invisible-char">•</property>
-                <property name="placeholder-text" translatable="yes">Search...</property>
-                <property name="secondary-icon-name">edit-find-symbolic</property>
+                <property name="receives-default">1</property>
               </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToolItem">
             <child>
-              <object class="GtkSwitch" id="switch1">
+              <object class="GtkButton">
+                <property name="label" translatable="yes">And I&apos;m another button</property>
                 <property name="can-focus">1</property>
-                <property name="valign">center</property>
-                <property name="tooltip_text">Switch it</property>
+                <property name="receives-default">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">This is a button party!</property>
+                <property name="can-focus">1</property>
+                <property name="receives-default">1</property>
               </object>
             </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="valign">center</property>
-        <property name="halign">center</property>
-        <style>
-          <class name="linked"/>
-        </style>
-        <child>
-          <object class="GtkButton">
-            <property name="label" translatable="yes">Hi, I am a button</property>
-            <property name="can-focus">1</property>
-            <property name="receives-default">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="label" translatable="yes">And I&apos;m another button</property>
-            <property name="can-focus">1</property>
-            <property name="receives-default">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="label" translatable="yes">This is a button party!</property>
-            <property name="can-focus">1</property>
-            <property name="receives-default">1</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkToolbar">
-        <property name="hexpand">1</property>
-        <property name="toolbar-style">icons</property>
-        <style>
-          <class name="inline-toolbar"/>
-        </style>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-add-symbolic</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-add-symbolic</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-remove-symbolic</property>
-            <property name="active">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-remove-symbolic</property>
-            <property name="active">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="sensitive">0</property>
-            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">edit-find-symbolic</property>
           </object>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
-            <property name="sensitive">0</property>
-            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">go-up-symbolic</property>
-            <property name="active">1</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="spacing">10</property>
-        <child>
-          <object class="GtkButton">
-            <property name="label">Plain</property>
-            <property name="halign">end</property>
+          <object class="GtkToolbar">
             <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="label">Destructive</property>
+            <property name="toolbar-style">icons</property>
             <style>
-              <class name="destructive-action"/>
+              <class name="inline-toolbar"/>
             </style>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Normal</property>
+                <property name="use-underline">1</property>
+                <property name="icon-name">list-add-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Normal</property>
+                <property name="use-underline">1</property>
+                <property name="icon-name">list-add-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Active</property>
+                <property name="use-underline">1</property>
+                <property name="icon-name">list-remove-symbolic</property>
+                <property name="active">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="label" translatable="yes">Active</property>
+                <property name="use-underline">1</property>
+                <property name="icon-name">list-remove-symbolic</property>
+                <property name="active">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="sensitive">0</property>
+                <property name="label" translatable="yes">Insensitive</property>
+                <property name="use-underline">1</property>
+                <property name="icon-name">edit-find-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton">
+                <property name="homogeneous">1</property>
+                <property name="sensitive">0</property>
+                <property name="label" translatable="yes">Insensitive Active</property>
+                <property name="use-underline">1</property>
+                <property name="icon-name">go-up-symbolic</property>
+                <property name="active">1</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="label">Suggested</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
+          <object class="GtkBox">
+            <property name="spacing">10</property>
+            <child>
+              <object class="GtkButton">
+                <property name="label">Plain</property>
+                <property name="halign">end</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label">Destructive</property>
+                <style>
+                  <class name="destructive-action"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label">Suggested</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
       </object>
     </child>
   </object>
-    </child>
-  </object>
 </interface>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index c2ee74eb7b..3e529eae25 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -2,6 +2,7 @@
 <interface>
   <object class="GtkGrid" id="grid">
     <property name="row-spacing">10</property>
+    <property name="margin">10</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkToolbar">
@@ -92,6 +93,7 @@
             <child>
               <object class="GtkSwitch" id="switch1">
                 <property name="can-focus">1</property>
+                <property name="valign">center</property>
                 <property name="tooltip_text">Switch it</property>
               </object>
             </child>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 0f061c83e3..6814398865 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -3692,50 +3692,50 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkStackPage">
-          <property name="name">basement</property>
-          <property name="child">
-            <object class="GtkBox">
-              <property name="orientation">vertical</property>
-              <child>
-                <object class="GtkModelButton">
-                  <property name="text">Basement</property>
-                  <property name="role">title</property>
-                  <property name="menu-name">main</property>
-                </object>
-              </child>
-              <child>
-                <object class="GtkSeparator"/>
-              </child>
-              <child>
-                <object class="GtkModelButton">
-                  <property name="text">Berk</property>
-                  <property name="action-name">app.berk</property>
-                  <property name="indicator-size-group">basement-indicators</property>
-                </object>
-              </child>
-              <child>
-                <object class="GtkModelButton">
-                  <property name="text">Broni</property>
-                  <property name="action-name">app.broni</property>
-                  <property name="indicator-size-group">basement-indicators</property>
-                </object>
-              </child>
-              <child>
-                <object class="GtkModelButton">
-                  <property name="text">Drutt</property>
-                  <property name="action-name">app.drutt</property>
-                  <property name="indicator-size-group">basement-indicators</property>
-                </object>
-              </child>
-              <child>
-                <object class="GtkModelButton">
-                  <property name="text">The Thing Upstairs</property>
-                  <property name="action-name">app.upstairs</property>
-                  <property name="indicator-size-group">basement-indicators</property>
-                </object>
-              </child>
-            </object>
-          </property>
+            <property name="name">basement</property>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkModelButton">
+                    <property name="text">Basement</property>
+                    <property name="role">title</property>
+                    <property name="menu-name">main</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkSeparator"/>
+                </child>
+                <child>
+                  <object class="GtkModelButton">
+                    <property name="text">Berk</property>
+                    <property name="action-name">app.berk</property>
+                    <property name="indicator-size-group">basement-indicators</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkModelButton">
+                    <property name="text">Broni</property>
+                    <property name="action-name">app.broni</property>
+                    <property name="indicator-size-group">basement-indicators</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkModelButton">
+                    <property name="text">Drutt</property>
+                    <property name="action-name">app.drutt</property>
+                    <property name="indicator-size-group">basement-indicators</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkModelButton">
+                    <property name="text">The Thing Upstairs</property>
+                    <property name="action-name">app.upstairs</property>
+                    <property name="indicator-size-group">basement-indicators</property>
+                  </object>
+                </child>
+              </object>
+            </property>
           </object>
         </child>
       </object>
-- 
2.30.2